Merge pull request #24 from andrade-ramon/master

Merge pull request #23 from andrade-ramon/eric