Fix install call
Fix failed PWD
Merge branch 'fix-install'