Updated some regular expressions
Updated the route tests
Modified a bit how the current position is calculated
Fixed bug with the route assembly
Improved the route parsing