Merge pull request #114 from peterkokot/master