Merge branch 'master' into dev
Fixed a wrong pattern about method invokes
NPM update
Merge branch 'dev'