Initial implementation for Annotation
Merge remote-tracking branch 'upstream/master' into annotation
Merge pull request #1 from amenophis/annotation

Initial implementation for Annotation