V1.0

merge v1.0 to master