Working on make sale
Merge remote-tracking branch 'origin'