Merge remote-tracking branch 'upstream/master' into vector
Merge remote-tracking branch 'origin/vector' into vector
Added more helpers for the express method