Merge pull request #2 from SpiderWebShow/master

Bunch of post-launch merges