Fix #102

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

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