Fix some bugs in implementation
Fix some bugs in implementation


doctrine/annotations,FabioBatSilva/annotations,iainconnor/annotations,codesource/annotations,iamluc/annotations,kinncj/annotations,crazycodr/annotations