Update index.js
Merge branch 'dev'