Merge pull request #1 from CPUTerminator/speedometer
Fixed formatting.
Synced branch with upstream

Manual sync of branch with upstream.