fix bug v2
Merge pull request #25 from djhvscf/master

fix bug v2