Updating matcher to support testing class callbacks
Merge branch 'v0.2.1'

Conflicts:
	Gemfile.lock