dobry commit
12 main do wgladu
"#12 merge with upstream"
Merge branch 'dev' into pr/25