Add "match" and "name" options
v0.0.2