added graphical interface
fixed merging :corn: