Fixed rout parser.
Merge branch 'test' into dev