Merge pull request #11 from huoxy/master

some fix