Add docs on function w/merge; fixes #505
Merge branch 'issue-505-merge-function'