Now working with 1.9.3