synchronization with changes from the dev branch #112

Closed jaedusandoval closed 7 months ago