update set function
Merge branch 'develop'