Compatibility with php 5.3
Merge pull request #336 from michelpa/master

Compatibility with php 5.3