Use composite unsubscribe in merge
Merge pull request #226 from raimohanska/merge-composite

Use composite unsubscribe in merge