Before pull
Merge branch 'master' of https://github.com/mjbp/editor

general update
Small steps...