definitive fix for s and ss
Merge pull request #118 from fabiosantoscode/ss

definitive fix for s and ss