first commit from rueben
Merge pull request #1 from ruebenramirez/master

first commit from rueben