modified function javier
Merge branch 'master' of https://github.com/poppr/poppr