Properly display both shares and hashrates

* As proposed in #132 thi allows for both shares and hashsrates

Fixes #132 and #133