Adding support for unsubscription to resolve #1