Merge develop
into main
for 1.3.0
release
#134
Merged
develop
into main
for 1.3.0
release
#134