Merge branch 'dev'
jshint fix