migrated to new version of fongo fixing a bug
Merge branch 'master' into step4