Fix install
Merge pull request #352 from romainneutron/setup-fixes

Fix install