Manaul merge of PR#10: https://github.com/volusion-angular-themes/vanilla/pull/10