Initial upload by Markus
Merge pull request #1 from schierle/master

Initial upload by Markus