Merge pull request #1644 from lurch/patch-2

Add stuation->situation, station,