Issue/bracket auto edit strategy

See the commit message of the first commit for a detailed summary of the changes. Probably the behavior is discussible, thus it is hided behind an option.