Merge pull request #4 from bramgeenen/master

updating branch
Merge pull request #5 from bramgeenen/test-branch

Merge pull request #4 from bramgeenen/master