Merge pull request #4 from SpiderWebShow/master

Merge pull request #74 from gfscott/master
Merge pull request #75 from gfscott/master

Merge pull request #4 from SpiderWebShow/master