a bug solved in 'zg new'
Merge branch 'develop'