Merge pull request #85 from hmert/master

merge with fear