bug fix
Merge branch 'master' of https://github.com/1409/TrainApp
Merge branch 'master' of https://github.com/1409/TrainApp