Ch3
Merge pull request #21 from okalright/#168

Close #168
Thanks.