closes #42; closes #43