Merge pull request #1 from joshuamataaraya/Joshua

Joshua
Merge pull request #2 from joshuamataaraya/manuel

2