now compatible with earlier versions of PHP
Merge branch 'unstable'