Merge pull request #38 from octo/ff/mongodb