Refine the logic of unsubscribing.
Merge pull request #5 from hubnate/developing

Refine the logic of unsubscribing.