fix bug
merge zzq
Merge branch 'chirowong-master'