Improved match macro
Improved match macro