Merge pull request #1 from wruppelx/master