ticket_581: bugs solved
minor update
Merge pull request #182 from ehenneken/ticket_581

Ticket 581: fix for couple of metrics bugs