Merge pull request #10 from danielfoord/dev

merge dev into master