Feature/update emacs