my frist change: a new function
Merge remote-tracking branch 'github/master'