Bring repo up to date with LeipeLeon's work

Will bring my repo up to date with the work LeipeLeon has done.