Merge pull request #23 from andrade-ramon/eric

Merge pull request #22 from andrade-ramon/master