Added 1.5 and 1.5.1 compat