mods to controllers
Merge remote-tracking branch 'upstream/master'
Merge pull request #7 from chiswilson/master

mods to controllers