Merge pull request #43 from shadowglen/master

修复bug #42