Added some options for better history file control