Updated to use phpdoc v2.5.0