Merge branch 'develop' into 'main'

Update the architecture section to reference new components (fix for #24)

See merge request !22