Merge pull request #244 from dizzzz/feature/Improve_contentextract_code

General code improvements Content extraction