Merge pull request #1 from Caf131/master

pull
Merge pull request #2 from Caf131/dev-chris

Merge pull request #1 from Caf131/master