merge v1.0 back to master