Closed #32, Closed #34