Refactor code
Merge branch 'master' of https://github.com/yixia/ZI

# By Crossle Song
# Via Crossle Song
* 'master' of https://github.com/yixia/ZI:
  Refactor code