MatchupGenerator first part
Fix
Merge branch 'master' of github.com:bcdev/sst-cci-toolbox