Merge pull request #59 from hmert/master

Merge