Adding nice options for subscriptions and #15
Merge