Beta 0.9.1

Fixes two large bugs