Feature/mongo 2.6.5 expressions add

I have addressed the issues in the new Add/And/Or branch.