Fixing Market buying and selling - not complete yet
Merge origin/master