Use better matcher
Add classes option
Bump version to 0.4.0