Add wildcard params support
Merge branch 'features/wildcards'