Closes #42 and closes #43