Updated for PHP 5.6 support
Updated doc