Added GUI Code
Merge origin/master