Added patch from IH.
Minor formatting fix caught by IH.