Fix function name
Merge branch 'master' into design