Fixed docblocks to be phpDocumentor 2 compatible