Merging Master with GUI

GUI is a testing area for new feature.. only merge when test = Ok