add "history" option + bug fix
Merge remote-tracking branch 'origin/addHistoryOption' into addHistoryOption