Done the TODO

Needed it without the dependency on mongoDB
Merge pull request #28 from refack/patch-2

Done the TODO