Merge pull request #9 from JeroenMathon/Development

Removed obsolete files.
Update CMakeLists.txt
Merge pull request #10 from JeroenMathon/master

Update