final commit for v1.0