CF-154: handle mixed content, add tests
Merge pull request #9 from shintasmith/CF-154_mixed_content

CF-154: handle mixed content, add tests