Replace origin code with a better subscription
Merge pull request #23 from bengler/ditch-origin-checker

Replace origin code with a better subscription