More setup
Merge pull request #2 from friendrescue/more-setup

More setup