added an override option
updated the change log, and so on