JSHINT
Merge branch 'master' into moreParallelizing