Added callback matcher
Resolving conflicts
Merge branch 'norzechowicz-callback-matcher'

* norzechowicz-callback-matcher:
  Added callback matcher