Fixes #120 and #119

I've fixed both #119 and #120 .
It might be of importance to check if listening on `dispatch` instead of `route` is a security breach. I couldn't think of a use case where this would be true but it might be important to think this through.