Merge pull request #88 from Maven85/master