Merge pull request #23 from tony--/F2F_agenda_edits_2