Added support for annotations. Early.
Merge remote-tracking branch 'origin/master'