Logging rewrite, from scratch
Merge pull request #6 from arax/dis_fix

Logging rewrite, from scratch