Revert "Merge branch 'master' into mongoProd"

This reverts commit d711c870a82218144ebceb973ab02b1b9edce656, reversing
changes made to 4162cc61d3e088c814981d9fbe59b471ea671c8b.

fixed #21
fixed #24
fixed #25
fixed #26