Merge pull request #730 from jvanz/create-or-update-function

Merge pull request #730 from jvanz/create-or-update-function #231