more messing about
Merge pull request #2 from dajbelshaw/master

more messing about