Merge pull request #112 from MartyBurns/master

Merge of retailtosubscription into master