fix fore NodeJS
Merge branch 'master' into nodeJS