refactor for jshint passed
update version
Merge branch 'dev'