Fechando issue #10.