buildMessage should only add metadata if there are metadata keys
Merge pull request #5 from guss77/master

buildMessage should only add metadata if there are metadata keys