Pull out matchers
Update tasks
Bump Version