merge for v1.0-alpha