Resolve "extract more user functions"

Ramon Nourequested to merge
rnou/339-extract-more-user-functions into master

Closes #339 (closed)

Merge request reports