Improved delegate callbacks. Fixed timer invalidation @ stop
Merge branch 'master' of github.com:iamcam/BionicHeart