Merge branch '16-fix-bug-qzb' into 'main'

Resolve "fix bug qzb"

Closes #16

See merge request !17