Merge pull request #1986 from Sayegh7/master

[Fix] Make installation less restrictive when NVM_DIR is set