fix errors
Merge pull request #1 from woodywang/master

fix errors