Merge pull request #47 from Dekker500/master

Logging infrastructure update