0.9.7. Fixes on blocking thread and others