Merge pull request #8 from NomNuggetNom/nom

Update master
Merge pull request #13 from NomNuggetNom/nom

Update main
Merge pull request #14 from NomNuggetNom/master

Update nom