Added 1.5.2 support. 1.4.7 deprecated