Support space restoration#92

tmandry wants to merge 2 commits intomaintmandry/Swindler:mainfrom

restorationtmandry/Swindler:restorationCopy head branch name to clipboard