V10.2.5 update

Fix for #86 & #85