setup
Merge pull request #311 from rmcgibbo/setup

setup