some bugs fixed, but not all of them
Merge pull request #2 from lei-april/master

some bugs fixed, but not all of them