first update for programm with the gui
Merge origin/master