for merge kaohsiung
Merge branch 'master' of github.com:fhopecc/stxt
turing