Merge branch 'add-function'
Merge branch 'master' into add-function