Merge pull request #1 from plopesc/7.x-1.x

Use specific annotated class
Merge remote-tracking branch 'upstream/7.x-1.x' into 7.x-1.x