Merge pull request #298 from jerv13/master

Update logger format
Merge remote-tracking branch 'upstream/master'