Adding myself to the agenda for this month.
merging nick's changes and resolving conflicts