fixed price bug
fixed merge conflict
changes
Merge pull request #7 from stevenmiller888/master

fixed price bug