Merge pull request #92 from dangowrt/for-15.05.01