Merge pull request #2 from apdavison/master

Seems good