final commits for v1.0