Fixed PHP 5.4 incompatibility.
Some PHPDoc fixes.
Merge pull request #21 from mekras/php54

PHP 5.4 incompatibility fix