some bugs fixed
some bugs fixed
Merge pull request #17 from lei-april/master

some bugs fixed