merged scraper feature branch