added station id
added subdistrict (but with unicode problem)
Merge remote-tracking branch 'upstream/master'