update ex3
Merge branch 'master' into master-github