Syntax fixes for PHP 5.5
Merge pull request #3 from bschwab/master

Syntax fixes for PHP 5.5