Bring new changes into the main dev branch #90

Closed dylancbaker closed 1 week ago