Merge pull request #23 from JeroenMathon/Testing

Testing