Merge branch 'refactor' into 'master'

Refactor

See merge request !4
2 jobs for master in 2 minutes and 6 seconds
latest