Merge pull request #1285 from ickata/master

Class.Singleton