Remove todos not needed anymore
Trigger buildbot
Merge pull request #11 from triplem/master

Trigger