Merge pull request #96 from alanwoolley/persist-fix

Possible fix for Issue #85
Merge remote-tracking branch 'upstream/0.30' into 0.3-test