Updating to new controller schema.
Merge pull request #116 from mnjuhn/dev

Updating to new controller schema.