Merge pull request #7 from jadiosa/master

Merge pull request #23 from jenniferperez/master
Merge pull request #24 from jenniferperez/master

Merge pull request #7 from jadiosa/master