Merge pull request #2 from ldurazo/master

first commit ever