Message logging fixes
Merge pull request #5 from ecere/master

Message logging fixes