We shouldn't have 'todos' in the code. Let's use the ticket system to track this stuff
Merge pull request #3 from brabidou/test_branch

We shouldn't have 'todos' in the code. Let's use the ticket system to tr...