code review #6
Merge pull request #10 from NBallaney/setup/initial

code review #6