Merge pull request #1 from gafish/master

bug fixed