add "history" option + bug fix
Merge pull request #8 from macklay/addHistoryOptionPatched

add "history" option + bug fix