fixed issue #12
Merge pull request #19 from dannyuan/master

fixed issue #12