change 2
Merge branch 'master'
change 3
method 2