Merge pull request #48 from MartyBurns/master

Merge of retailtosubscription into master