Original author: Mike Oliphant <grip@nostatic.org>

Updates from v3.3.1: Hugo Villeneuve <hugo@hugovil.com>

See Changelog and CREDITS for the many code contributions
by others