Closed #25, closed #27.