Renamed BaseClass to MatchException
Merge branch 'fredrik' into Sats