backtrack a little
Merge pull request #1 from bemyhre/setup

backtrack a little