Fixed: https://github.com/Sammaye/MongoYii/issues/182
Addition to last fix
Fixed: https://github.com/Sammaye/MongoYii/issues/181
Merge remote-tracking branch 'upstream/master'
Comments and refactor