Add some comments for #20