Merge pull request #4 from philmikejones/master

Merge in Phil's sensible changes - good plan