DRY'd out the rage controller a bit more
Merge remote-tracking branch 'origin/master'