Used a list of curves instead of an array
Replaced the dictionary gsim_by_rlz with two lists
Merged from master
Merged from master