Merge pull request #156 from jonasdn/gtk-gui