Ch5
Merge pull request #25 from okalright/#170

Close #170
Thanks.