added GUI
merge
merge