Fix some build issues
Merge pull request #20 from mbertrand/fixsetup

Fix some initial build issues