Merge pull request #9 from pietervp/master

Merge