updated todos
Merge branch 'master' of github.com:SalvatoreTosti/urchin