Merge pull request #1 from amenophis/annotation

Initial implementation for Annotation