Update price
Merge origin/master