merging #41

Closed padgriffin closed 1 year ago