Merge pull request #40 from mitegab/my-new-branch

Merge pull request #40 from mitegab/my-new-branch #66