Merge pull request #22 from kevinkhill/setup-usage