Changes proposed on this pull request: Fixes # . Reviewers @carloluis @matiasdelgado @rrivem @marina-acosta