Fix #6 (compatibility with PHP 5.3.3)
Merge remote-tracking branch 'laruence/master'