Merge pull request #1 from jandantes/express4

Merge express4 to master