-- add bid function
Merge origin/master