Merge pull request #1 from VanHerp95/feature/mongoid_support

Fixing mongoid support bugs