Merge pull request #166 from klemmster/master