Added support for 1.6