update on v1.0
merge v1.0 on master