chuanconggao Merge pull request #2 from apnewberry/patch-2 …