Support for PHP 5.6. Changed a few comments.