Closed #40 #41