Updating with requested changes.

changing ordering
Merge pull request #71 from scollier/rescue_mode

Thanks! Adding now.