Simplify singelton registration
Merge pull request #5 from mwjames/singleton

Simplify singelton registration