Added support for 1.5 (without breaking 1.4)