Pre 0.9.1 release

Last commits before updating to 0.9.1 release.