Merge pull request #1 from domharrington/master

Couple of minor things