Add controller methods
Merge branch 'master' into models
Merge pull request #2 from blackwatertepes/models

Models