Fix this in the right way
Merge pull request #120 from alex/fix-mongo-right-way

Fix this in the right way