Merge pull request #239 from mrosoiu/log-context

Merged #239.
- fix encoding mixups
- register pull request #239