Fix runtime counter reporting
Merge remote-tracking branch 'yvasiyarov/runtime_counter_fix'
Refactoring names from #64 slightly