fix more bugs
Merge pull request #20 from lei-april/master

fix more bugs