better offline handling
version bump
Merge branch 'hotfix/0.9.7'