Merge branch '42-split-the-settings' into 'master'

Resolve "Split the settings"

Closes #42

See merge request !37
3 jobs for master in 1 minute and 57 seconds (queued for 1 second)