fix custom matcher example
Merge branch '07_controller_cleanup' into 08_features
Merge branch '08_features' into 09_speedup
Merge branch '09_speedup' into 11_tdd
Merge branch '11_tdd'