fix bugs after merge
Merge pull request #143 from hmilvu/master

fix some bugs after merge 0.9.3