Added load and did some tidying.
Merge pull request #1 from HarveyHunt/load

Added load and did some tidying.