Fix up setup
Merge pull request #3 from adepue/master

Fix up setup