Merge #170 by hand
Merge #180 by hand.