Merge branch 'release/3.1.2' into develop
Fixed index.js
Merge branch 'master' into develop
bumped version
Merge branch 'release/3.1.3'