Solves issue #231

@agnogueira @hvelarde