Merge branch 'dev'
refactor for jshint passed
update version