Merge pull request #2 from Unitech/development

Development
fix: match more complex arguments
Merge pull request #843 from Tjatse/development

fix: match more complex arguments