Merge pull request #2 from Caf131/master

pull request