#22 Added estimated time and distance
Merge remote-tracking branch 'origin/route' into dev