updating editor window
Merge origin/master
fixed execution
Merge origin/master