Pulling new code for backtest

From D-Nice.