Updated to reflect v1.2.5 - check changelog for breakdown of updates