Added editor
Merge branch 'penelopa'