Improve PHP scraper

Fixes #20