zhangxiangxiao Merge pull request #28 from Jason-Cooke/patch-1