#24 Add test
#23 Add match support