merged GUI changes
Merge pull request #1 from ntsmwk/master

merged GUI changes