Merge pull request #265 from lins05/master

fixed #264