bugfix
Merge pull request #45 from leoliang/master

bugfix