Bug499-WangZiming #60

Closed
wangziming wants to merge 9 commits from Bug499-WangZiming into master

9 Commits (master)