Made payment request unsubscribe when really everything is finished
Merge pull request #2 from 6wunderkinder/misha/fixes

Misha/fixes