fix merge error
Merge pull request #33 from chestnutchen/master

fix merge error