Improved tray menu
Allow only one instance of the settings dialog to exist
Merge pull request #2 from nurupo/master

update merge