Merge pull request #18 from ChrisLundquist/cl/mongodb