updated to work with SS3
ss3 adjustments
Merge pull request #3 from anselmdk/ss3

SS3