Merge branch 'save-and-reload-improvements' into 'master'

Improve save and reload towards global scan (see: #62).

Closes #40 and #54

See merge request !106