#44 added parameter name pattern and match