Resolve "Restoration work"

Merged Thomas Markwalder requested to merge 64-restoration-work into master

Closes #64

Reviewers please:

Edited by Thomas Markwalder

Merge request reports