PHP 5.5 compatibility fix
phpdoc fixes
Fixed callback
Merge pull request #2 from samdark/5.5-and-cleanup

5.5 and cleanup