Updated to work with underscore 0.9.10