Overwrite underscore helper and fix framework
Merge remote-tracking branch 'origin/master'