Pull request to MrDanMacDonald from Up-to-date Branch