Updated for Express 4 compatibility.
Closes #2