Refactored for integrate Presenter
Merge branch 'master' of https://github.com/raptor-mvk/Zeus