Merge pull request #21 from PurpleKangaroo/master

LW Expansion
Merge pull request #22 from PurpleKangaroo/master

work from when i was gone
icon changes
Merge pull request #289 from HoltMaki/master

Icon changes