Updating to include earlier and later train navigation
Merge branch 'dev'