Fixes Express, issue #45

Fixes #45
Fixes Socket.io, issue #46

Fixes #46