Merge pull request #1 from Caf131/master

pull