changes on BidBean
Merge origin/master