Several fixes.
Merge branch 'feature/route-parser' into develop