Improve checks regarding annotation boundaries

Resolves #6

Change-Id: I3a41d239ea44923720bb7d557de26f30f285ae67
6 files changed