Merge pull request #23 from JeroenMathon/Testing

Testing
Merge pull request #24 from JeroenMathon/Development

Merge pull request #23 from JeroenMathon/Testing