Fixed bug in older versions of NVM
Merge branch 'develop'

Release 0.4.1