All three pricing scenarios now in place
Merge remote-tracking branch 'origin/master'