Made a few tweaks to the code in the repository.
Merged my changes from both branches.