more controller methods
Merge branch 'master' into controller