Merge changes to mholden8 fork.

Merge the changes made in the PerkTutor repository to the mholden8 fork.