Merge pull request #96 from gorzell/master

#95 Fix logging contexts, and thread naming.