Merge pull request #1 from PatrickSteiner/master

initial
Merge pull request #1 from wrichter/master

Merge pull request #1 from PatrickSteiner/master