Updated to use phpdoc 2.0 stable