Encore Message fix
Merge pull request #371 from Fuzzysqurl/master

Encore Message fix