Merge branch 'route-namespace', fixes #50