refactored

Signed-off-by: Emmanuel Mathot <emmanuel.mathot@gmail.com>
ready to pack 1.2.0

Signed-off-by: Emmanuel Mathot <emmanuel.mathot@gmail.com>
Merge branch 'release/1.2.0'
Merge tag '1.2.0' into develop

v1.2.0