revamped for SS3.0.x

--amend
Merge pull request #2 from ivoba/upstream

revamped for SS3.0.x