Merge pull request #5 from JeroenMathon/master

Update Testing