Merge pull request #3 from Caf131/master

Merge