Merge pull request #1 from jandantes/express4

Merge express4 to master
Merge pull request #2 from jandantes/master

Merge pull request #1 from jandantes/express4