subscribe method refactored & improved (a bit)
Merge remote-tracking branch 'origin/master'