Upgrade for Express 4
Merge Express 4 support
0.6.0