update by david
Merge branch 'master' of https://github.com/davidHuanghw/ZZJZ
update by david