Pulling changes from UrsKR

I just want to keep my fork up-to-date.