Merge pull request #6 from Wohlstand/master