Committing
Committing TrainController updates
Merge origin/master