feature(public): Fix messages
Merge pull request #197 from Yahkob/messageFix

feature(public): Fix messages