Final commit likely

Did things
Merge pull request #8 from albperez/master

Final commit likely