Merge pull request #1 from Tophans/master

Fix Bug in demo GUI