bugfix
Merge pull request #1 from SamZeng/master

bugfix