added subscription stuff
Merge pull request #8 from vforgione/dev

added subscription stuff