fix bug
Merge branch 'master' of https://github.com/viticm/pap_full