Merge pull request #1 from PedroLamas/master

Debug info changes & thread-safe singletons