Updated to work with 1.6