Merge pull request #17 from ZhiGuang/master

Fixed issue #15