Samll patches to the controller for custom stores.
Merge pull request #7 from freerunningtech/controller_fix

Small patches to the controller for custom stores.