Improved phpDocumentor2 compatibility and some annotations