Merge pull request #3 from SpiderWebShow/master

tidying up some old commits
Merge pull request #74 from gfscott/master

Merge pull request #3 from SpiderWebShow/master