changes to controllers
Merge pull request #18 from chiswilson/master

changes to controllers