Merge pull request #1 from CTownsdin/master

gj!
Merge pull request #3 from ecjs/master

Merge pull request #1 from CTownsdin/master