ssfi as it should be
Merge pull request #233 from Empeeric/master

ssfi as it should be