fixed user installation, has not worked for a while
Merge branch 'develop'