Merge branch 'qian_exercise' of github.com:cico1989/workshop_exercise