bug fixes
Merge pull request #43 from Yaliang/master

bug fixes