Final commit before release of version 0.9.6