Fix issue #7 #8 and #9

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