3.3/develop

Update to Pull Request 29, with PSR-0 filenames