Matching pace

Bringing the PHP version up to speed (and then some) with the HTML
version.
Close #26
Close #12