Final updates for v1.0.5