Added window icon
A few minor tweaks
Merge pull request #3 from msteiger/master

Minor changes