bugfix
Merge pull request #13 from leoliang/master

bugfix