Merge dev
into main
for 1.0.0
release
#22
Merged
dev
into main
for 1.0.0
release
#22