bug fix up
Merge pull request #11 from Yaliang/master

bug fix up