modify function.extend
Merge branch 'dev'
modify function.extend
merge dev