Merge pull request #10 from danielfoord/dev

merge dev into master
Merge pull request #11 from danielfoord/master

Merge pull request #10 from danielfoord/dev