Merge pull request #1 from JeroenMathon/Development

Development
Merge remote-tracking branch 'origin/master' into Development
Updates some files