implemented editor window update
Merge origin/master