implement #18 partially (parameter missing)
Merge remote-tracking branch 'origin/issues18_variables'