Merge pull request #36 from gui_design into develop