Updated shared scheme
Merge remote-tracking branch 'origin/grimley517-issue1' into grimley517-issue1