Done in branch #23