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

Initial dev build