PHP 5.3 Compatibility break after new design merge.
Merge pull request #20 from oat-sa/php53-compatibility

PHP 5.3 Compatibility break after new design merge.