Merged #99

Signed-off-by: Juan Martin Runge <jmrunge@gmail.com>