Refactor mediator
Merge branch 'master' of https://github.com/minardi/SSTT-client