Auto-Return cleanup. Working to resolve: websharks/s2member#205
Improving error messages. See: websharks/s2member#205
Merge pull request #283 from websharks/feature/205

Feature/205