Merge pull request #8 from wedgex/master

Rando Setup Stuff