Merge branch 'log-parser'