Does a small refactoring
Fixes a bug in RestfulRouter
Merge branch 'origin/master'