Merge pull request #2 from hughrawlinson/master

y
Apparently I removed a line I wasn't supposed to...
Merge pull request #3 from hughrawlinson/patch-1

Patch 1