Merge branch '15-minor-bug-fixes' into 'main'

Resolve "minor bug fixes"

Closes #15

See merge request !16