Merge branch 'rnou/339-extract-more-user-functions' into 'master'

Resolve "extract more user functions"

Closes #339

Closes #339

See merge request !227