Merge branch 'refactor' into 'master'

Refactor

See merge request !25
5 jobs for master in 8 minutes and 47 seconds (queued for 1 second)