Merge pull request #5 from Holsje/master

Added all files
Removed test comment
Merge pull request #6 from Holsje/Edits-Onno

Edits onno