Rewrite base controller so it works as expected.
Merge pull request #13 from Battlefy/fix/base-controller

Rewrite base controller so it works as expected.