Implemented recovery
Merge pull request #8 from akellehe/add-recovery-rc1

Implemented recovery