Merge pull request #219 from nwinklareth/v2.0-dev

Scraper changes
Merge pull request #220 from nwinklareth/v2.0-dev

VS2.25 - fixed error in the Scraper catchup logic