Fixed weird scraper bug
Merge origin/master