Merge branch 'stf-refinement' into 'develop-v2.1.1'

Stf refinement

Closes #21, #8, and #17

See merge request !3
2 jobs for develop-v2.1.1
in 27 seconds, using 0 compute credits, and was queued for 3 seconds
latest