Issue #131 - Demarcation of match start and end