Class S: new surround feature

See #61
Merge branch 'develop'
Missing UT
Merge branch 'develop'