Silly fix for inheriting eventemitter in router
Merge branch 'master' into router-fix
Merge pull request #103 from bennlich/router-fix

Silly fix for inheriting EventEmitter in router