Merging the updates from past dev branch with new small changes that allow us to work properly with most recent dependencies #165

Closed jdiegodcp closed 4 months ago