Third Change
Merge pull request #16 from Caf131/dev-chris

Third Change
Merge pull request #6 from Caf131/master

Next merge...