Closes #823 Signed-off-by: Thomas Citharel <tcit@tcit.fr>
Closes #810 Signed-off-by: Thomas Citharel <tcit@tcit.fr>