fix issues
Merge pull request #1 from chainzhang/test

fix issues