Mostly esthetic commit
Refactoring
Added ThrougputListener, based on Metrics
Merge origin/master