follow up to #604 - gtk gui
Merge remote-tracking branch 'upstream/master'
Merge pull request #605 from CodingAnarchy/master

follow up to pull request #604