Fix singleton_s
Merge pull request #2 from balat/master

Fix singleton_s