0.9.0 compat
Finish merge and update docs