Merge pull request #111 from MartyBurns/master

Merge of retailtosubscription into master