Cool edit

Cool edit
Merge remote-tracking branch 'origin/CoolEdits'