David Winsemius for reporting a bug and some Mac testing

David Kaplan for a bug fix.
