Merge pull request #21 from kevinkhill/setup-script