Pricing model switch#36

Close #36