Refactor to use Frame Controller
Merge pull request #16 from deini/dev

Refactor to use Frame Controller