Modified function 2
Merge remote-tracking branch 'origin/issue3'