Update #15 and prepare #20