Merge pull request #10 from Patrik356b/master

Merge nightly & master