added code to check for next station
Merge origin/master