Solves issue #239

@hvelarde @agnogueira