Issue #10 is now really fixed ! (i hope...)