Added QT gui
Fixed merging issues