fixing installation problems
Merge branch 'hotfix'