Fixed GUI Issue (maunal merge of gui and master branch)