small fix + add new option (#1106)