v1.0.4 - Fixing a couple bugs with subscriptions