Added support for 1.6

Hopefully this will work on 1.6 with no extra changes.