Bugfix in router
Merge branch 'master' into dev