Improved Image scraper

Added ability to scrape from #content