Merge pull request #86 from nhr/master

Fixed some minor subscription issues