Merge pull request #10 from JeroenMathon/master

Update
Merge pull request #11 from JeroenMathon/Development

Merge pull request #10 from JeroenMathon/master