Merge pull request #4 from bramgeenen/master

updating branch