Merge pull request #84 from Maven85/master