Ticket 452: metrics speedup by total overhaul
Merge pull request #45 from ehenneken/ticket_452

Ticket 452: metrics speedup by total overhaul