Merge pull request #31 from ceesvanegmond/master

Merge
Merge branch 'master' into develop