Merge pull request #1 from PatrickSteiner/master

initial