v3.2.1 Updated by jcurry for compatibility with 3.2.x and 4.2.1