add marker
rename to short name
Merge branch 'master' of https://github.com/jinkuen/TaiwanLiveHouse