Updated my Fork to most recent commit from Khroki's main branch