Merge pull request #67 from mitchellbusby/master

Resolves MatthewJA/Coffeequate#64
Resolves MatthewJA/Coffeequate#65