Improvements to subscription checking & ip lookups
Merge pull request #79 from nhr/master

Improvements to subscription checking & ip lookups