[s2p] fix
Merge branches 'testing' and 'master'