v0.32 - final commit