Pull request for v1.0