Separate diferrent types of matches

closes #16