Merge pull request #16 from wdl1908/master

Fix for tray Icon.
Merge remote-tracking branch 'upstream/master'