modif conditions
Merge branch 'master' of https://github.com/lysbleu/pvm-bss