Merge pull request #181 from SaveTheRbtz/master

Iterator and recovery improvements.
v2.24.13.8