Merge pull request #1 from mromero90/master

pr1