setup
Merge pull request #2 from rustyswayne/master

setup