0.9.6. Minor updates and fixes