Merge pull request #13 from andrade-ramon/master

Merge pull request #12 from andrade-ramon/eric
Merge pull request #16 from andrade-ramon/eric

Merge pull request #13 from andrade-ramon/master