modified function code
Merge branch 'beta'