Fix bugs
Merge pull request #9 from zhuoqun/2.0

Fix bugs