Ch2
Merge pull request #20 from okalright/#167

Close #167
Thanks.