Resolved #41, Closed #42