changes proposed in Pull Request, + bugfix for "NW" mealType specifier