Merge pull request #84 from dangowrt/master