Use matchComponents
API where possible
#26
Merged
matchComponents
API where possible
#26