Adding message logging
Merging changes