Merge pull request #5 from Caf131/master

Merge attempt
Merge pull request #16 from Caf131/dev-chris

Third Change
Merge pull request #6 from Caf131/master

Next merge...
Fourth!

Fourth change!
Merge pull request #17 from deluda/master

Fourth!
Merge pull request #18 from Caf131/master

deluda merge