Merge pull request #10 from JeroenMathon/master

Update