Merge pull request #5 from jadiosa/master

Merge pull request #19 from jenniferperez/master
Merge pull request #20 from jenniferperez/master

Merge pull request #5 from jadiosa/master