Added RS output to restorer. Closes #479
Merge remote-tracking branch 'origin/develop' into develop