Merge pull request #11 from andrade-ramon/master

Merge pull request #10 from andrade-ramon/eric