Setup
Merge pull request #2 from jim-parry/master

Setup