Merge pull request #62 from iRail/master

Sync
Updates to stations
Merge pull request #64 from iRail/development

Update to stations