Now working and tested for 1.4.7 - 1.7.10