Correcoes do issue #8