Merge pull request #1 from marielb/master

maybe this?
Merge pull request #2 from jonathanreyes/master

3rd try