Merge branch 'jk/add-e-kill-editor'