Updated build and price tracking code
Merge pull request #713 from shutter111/development

Updated build and price tracking code
Merged with Dev branch