Function def

Merged Patrick Hofmann requested to merge function_def into master

Merge request reports