Closed #34. Closed #36.