Added support for 1.6 and later, sorry about the holdup