z transfer function block added (not yet tested)
Merge remote-tracking branch 'upstream/develop' into develop