Merge pull request #255 from nwinklareth/master

Next Generation scraper