Added TODOs to the code with my intents. Feel free to change stuff etc...
Merge pull request #22 from NicolasKessler/master

Added TODOs to the code with my intents. Feel free to change stuff etc.....