Fix issue with Options.IdentificationFunction not being set due to isNonEmptyOption returning false
Fix spelling mistake - Add macaron to supported list