Fix #38 and fix #39

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