bug fix
Merge branch 'master' of github.com:troublezhang/PePr

resolve some conflicts