changes to gui
before merge
Merge pull request #46 from nromanen/edd

Edd