Merge pull request #3 from SpiderWebShow/master

tidying up some old commits