Applied updates for v0.2.6