sync with develop
sync with develop
euc -> utf8
sync with develop
refactor (var -> public)
sync with develop