Merge pull request #75 from hmert/master

merge