Test 0.9.1

... not ready for full merge yet