ADD chenges for SS 3.0
Merge pull request #2 from xini/3.0

ADD changes for SS 3.0