Merge pull request #9 from zhengzhiren/master

Bug fix