GUI work
Merge remote-tracking branch 'upstream/master'
GUI progress
Merge pull request #35 from goldani/master

GUI progress