Annotations

See issue #91 on the issue tracker