fixed issue 21
Merge pull request #22 from Firxiao/develop

fixed issue #21