Merge pull request #84 from hmert/master

merge and fix