improve code
Merge branch 'develop'
update for jshint