Fixed a bug that editor command only works for files in root folder
Merge branch 'master' into start-opts