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

Fix/station id handling