more fixes, yay
Merge pull request #16 from abhijitnukalapati/master

Changing app icon
merging from upstream
Merge pull request #17 from brack/master

merging and fixes