Merge pull request #76 from chirowong/master

merge everybody to qatang