Merge branches 'testing' and 'master'
Merge branches 'testing' and 'master'
[s2p] add rennes dataset