Custom version of php_underscore with bug fixes and improvement