Merge pull request #1 from dannyreil/basicSetup

Basic setup