Correcoes do issue #27