Version 4.2.4 - Waynes Branch Merge