Merge pull request #268 from lowjoel/implement-missing-controller-functionality
Implement missing controller functionality

(main@b08bb4effdcab4f0c86d121db6f0f72764c907de)