Merge pull request #14 from NomNuggetNom/master

Update nom
Merge pull request #15 from NomNuggetNom/nom

Merge pull request #14 from NomNuggetNom/master