Fixes
Merge branch 'subscriptions' of https://github.com/Venture-TheSphinxTeam/Sphinx into subscriptions