Add user modification function
Merge branch 'master' into mod-user