Update edit logic
Merge branch 'master' of https://github.com/SavrukSergiy/dreamhost