Merge pull request #84 from Tectu/master