Updated MarketStrategy
Merge origin/master