MAking it match MangoDB API
Tightening it all up
Merge pull request #1 from CloudCorpCom/dev

Dev