bug fixes
Merge pull request #42 from Yaliang/master

bug fixes