Changes from Neil (Sheffield).
Merge pull request #11 from lawrennd/master

Changes from Neil (Sheffield).