merge zzq
fix
Merge pull request #24 from chirowong/master

20141227