Message handler fix and change of icon and name
Merge pull request #148 from devinlynch/John-April8-12

Message handler fix and change of icon and name