Added model methods
Merging
Merging..again
Merge branch 'master' into controller
Merge pull request #1 from heyimkko/controller

Controller