Merge pull request #2 from lgzhang/master

fix merge