Fixed the infinite message generation bug
Merge remote-tracking branch 'origin/master'