Issue #64 and Issue #72 Updates for refactoring and group fix.
Merge pull request #73 from alim/Issue_64_Refactor_Controller_Rescues

Issue #64 and Issue #72 Updates for refactoring and group fix.