Merge pull request #48 from ianbattersby/develop

Tidy up after merge.