Fix #228

Signed-off-by: Clement Escoffier <clement.escoffier@gmail.com>
Fix #229

Signed-off-by: Clement Escoffier <clement.escoffier@gmail.com>
Initial work on #230

Code approved by Mathilde !

Signed-off-by: Clement Escoffier <clement.escoffier@gmail.com>
Fix #230

Signed-off-by: Clement Escoffier <clement.escoffier@gmail.com>