Merge pull request #457 from danvk/fix-log