Fix logging and content parsing
Merge pull request #1 from saltlab/fix-log-and-content-parsing

Fix logging and content parsing