Fix all known issue
Merge pull request #13 from CalvertYang/master

Fix all known issue