Removed async require calls
Merge branch 'master' into mongo
Repaired after the merging