Corrected comment
Removed TODO points.. Need new ones?
Merge pull request #27 from MartindenDulk/develop

Develop