Initial dev build
Merge pull request #3 from simonwetting/master

Initial dev build