Added route calculation
Merge remote-tracking branch 'pcs/master'
merged changes with john's callout changes