tk810

acrescento  fixes menores no PR do @jamilatta