merged our changes into repo #16

Closed jenspetur94 closed 3 years ago