Express 4 support
Merge origin/master