Feature #81

Support for auto-attaching annotations if none has been found.