Refactor BaseController
Merge pull request #303 from theponti/refactor/base-controller

Refactor BaseController