Fix issues with matches.  Bump version to 0.5.