Merge pull request #18 from wruppelx/master