Pricing
Merge pull request #215 from sandal-smuggler/user-fixes

Pricing