Merge pull request #10 from Patrik356b/master

Merge nightly & master
Merge pull request #11 from Patrik356b/nightly

Merge pull request #10 from Patrik356b/master