Merged s2 code back from 0.6.1
bump