fix version branching
update MatchData
update readline
remove trailing white spaces