Merge pull request #13 from ridoo/fix/station-id-handling

Fix/station id handling
Merge pull request #142 from ridoo/develop

Merge pull request #13 from ridoo/fix/station-id-handling