Merge pull request #8 from tejinderss/master

Reverting back my previous commit
Switching to class based subscriber callback view