Merge pull request #2 from joshuamataaraya/manuel

2