Merge pull request #14 from PetterS/dev

Merge dev into master
Merge remote-tracking branch 'origin/master' into dev