Hotfix/mongo hadoop

Merge to my own master