Merge pull request #32 from Caf131/master

Merge Pull Request