Ses 1.2.1 merging

all changes made to SES 1.2.1 included