Merge pull request #9 from adamtaylo/working

Commit messages are a bit dodgy, but the changes look good

Going in :thumbsup: