Issue/5 improve match dispose