RFR: Renamed the module
ENH: Added measures, improved performance