version 1.0

update to version 1.0
Merge remote-tracking branch 'origin/master' into v1