Merge #23 by hand.