merge changes of master to good-branch, resolve conflicts
Merge branch 'master' of github.com:DanaZhao/good into good-branch