\todo added to the code
Merge branch 'dev' of https://github.com/nicolashincker/i-score into dev