Basic setup
Merge pull request #1 from gigaSproule/develop

Basic setup