Add matcher dependency
Improve documentation
Add test for list substitution