Merge pull request #20 from nubs/master

Change subscription behavior to be more flexible and simpler to use.