1 bugfix and minor features

Signed-off-by: Santiago Pestarini <santiagonob@gmail.com>