Commit 94ad509e authored by Emmanuel Promayon's avatar Emmanuel Promayon

FIXED bug resulting from merge conflicts + code simplification

parent aa092313