Fix #1 - Mediator should implement IMediator
Merge branch 'dev'