Merge pull request #1234 from obiconbig/develop

add function get_content_type to output class