Merge pull request #5 from Cofyc/fixbug

Fixbug
Merge remote-tracking branch 'origin/master'