Merge GUI to develop branch