new tray icon, other minor fixes
Merge pull request #1 from estol/master

new tray icon, other minor fixes