Merge pull request #1 from ragzzy/master

updates to controllers