Merge pull request #25 from andrade-ramon/eric

Merge pull request #24 from andrade-ramon/master