Fixed a bug with PM messages
Merge remote-tracking branch 'origin/master'