Partial #143

Signed-off-by: Pablo Lezaeta <pablo@localhost.localdomain>