Merge branch "Update" - trial

gui.stetic