Merge pull request #124 from xuhcc/prices

New price block
Fixed base-switch bug