Merge pull request #62 from ShadowSam/master

initial push
I'm cooler than a cucumber
Merge remote-tracking branch 'upstream/subscriptions'