DEVIDM-90: Do proper check for annotation.
Merge pull request #12 from tomma/DEVIDM-90

DEVIDM-90: Do proper check for annotation.