Semi-working state
Merge branch 'master' into devel
Minor changes
Merge branch 'master' into devel
Implement antecedent editing