S4 changes
Merge pull request #226 from K-McK/sr_dev

S4 changes