FATB-2 > master

fix: jshint errors with underscore