Merge pull request #46 from AceMNT/last

Small fixes to heart recovery
Merge pull request #47 from AceMNT/last

Changes related to delays
git status
Merged conflicts