Merge pull request #67 from chirowong/master

重新提一下