Merge pull request #79 from nicoverbruggen/development

Fixed #23 #63 and #30 + Code cleanup
resolved issue #78
merge with development
Merge pull request #80 from iRail/stationNames-issue#78

Station names issue#78
Merge branch 'development' of https://github.com/iRail/hyperRail into development

# By andreasDL
# Via andreasDL (2) and others
* 'development' of https://github.com/iRail/hyperRail:
  resolved issue #78