Make compatible with PHP 5.3
Merge branch 'compatability'