Controller Update for missing actions
Merge remote-tracking branch 'upstream/master'
Merge pull request #3 from amacgregor/master

Controller Update for missing actions