Did things
Merge pull request #5 from albperez/master

Did things