Merge pull request #15 from danielfoord/dev

master update
Merge pull request #16 from danielfoord/master

Merge pull request #15 from danielfoord/dev