second commit
Merge branch 'master' of https://github.com/nmlynl/accepts-subscriptions