couple changes
updated controller
Merge pull request #23 from chiswilson/master

updated controller