mergin all into v1.0.7