Merge pull request #25 from Jojatekok/master

Internalized classes in the Messages namespace