Merge pull request #9 from pietervp/master

Merge
Merge pull request #10 from pietervp/dev

Merge pull request #9 from pietervp/master