[FEATURE] Add 6.0 compatibility
[TASK] Remove obsolete singleton implementation
Merge pull request #94 from dreipunktnull/master

[FEATURE] Add 6.0 compatibility