Change to singleton approach
Merge pull request #1 from florianheinemann/require-singleton

Change to singleton approach