Fix #125. Correct cut-and-paste error in proxy function list
Merge branch 'master' into dev