Removed singleton usage
Merge pull request #38 from markijbema/remove-singletons

Removed singleton usage