Fixing install
Signed-off-by:Yassine Guedidi <yassine.guedidi@gmail.com>
Merge pull request #382 from yguedidi/fix-install

Fixing install
merge upstream/master